cssprovider: Don't propagate deprecation messages to passed-in error
authorBenjamin Otte <otte@redhat.com>
Wed, 18 May 2011 16:35:37 +0000 (18:35 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 18 May 2011 20:17:59 +0000 (22:17 +0200)
It's an informative message, don't stop parsing the CSS because of it.

gtk/gtkcssprovider.c

index ab6580451af8e2c83cb47ed54dc73fefc4d16f8b..1f6c7a7809b6139c68cf06e7370bb6751dc65530 100644 (file)
@@ -1410,6 +1410,13 @@ gtk_css_provider_propagate_error (GtkCssProvider  *provider,
                                   const GError    *error,
                                   GError         **propagate_to)
 {
+  /* don't fail for deprecations */
+  if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED))
+    {
+      g_warning ("Theme parsing error: %s:%u:%u: %s", path ? path : "<unknown>", line, position, error->message);
+      return;
+    }
+
   /* we already set an error. And we'd like to keep the first one */
   if (*propagate_to)
     return;